From 967a68008f99629535cf43e94156fc34f41cad8d Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 20 Aug 2008 01:12:54 +0000 Subject: [PATCH] [PATCH 6/7] bgo543308 - Only compute a font-based size if we are in expanded mode or one of the OPEN modes Signed-off-by: Federico Mena Quintero svn path=/trunk/; revision=21167 --- gtk/gtkfilechooserdefault.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 89a5075e57..50e3810a69 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -7806,21 +7806,33 @@ gtk_file_chooser_default_get_default_size (GtkFileChooserEmbed *chooser_embed, GtkRequisition req; impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed); - find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height); - if (impl->preview_widget_active && - impl->preview_widget && - GTK_WIDGET_VISIBLE (impl->preview_widget)) + if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN + || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + || impl->expand_folders) { - gtk_widget_size_request (impl->preview_box, &req); - *default_width += PREVIEW_HBOX_SPACING + req.width; - } + find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height); - if (impl->extra_widget && - GTK_WIDGET_VISIBLE (impl->extra_widget)) + if (impl->preview_widget_active && + impl->preview_widget && + GTK_WIDGET_VISIBLE (impl->preview_widget)) + { + gtk_widget_size_request (impl->preview_box, &req); + *default_width += PREVIEW_HBOX_SPACING + req.width; + } + + if (impl->extra_widget && + GTK_WIDGET_VISIBLE (impl->extra_widget)) + { + gtk_widget_size_request (impl->extra_align, &req); + *default_height += GTK_BOX (chooser_embed)->spacing + req.height; + } + } + else { - gtk_widget_size_request (impl->extra_align, &req); - *default_height += GTK_BOX (chooser_embed)->spacing + req.height; + gtk_widget_size_request (GTK_WIDGET (impl), &req); + *default_width = req.width; + *default_height = req.height; } } -- 2.30.2